From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 14 Apr 2012 05:16:02 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~2594
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3bace81626cc6ecdffc7901f3d03aa051d18c0af;p=emacs.git

Merge from trunk.
---

3bace81626cc6ecdffc7901f3d03aa051d18c0af